[PATCH 03/10] RTC subsystem, X1205 sysfs cleanup

[Alessandro Zummo]

 fixed sysfs show() return code

Signed-off-by: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>

---
 drivers/rtc/rtc-x1205.c |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

--- linux-rtc.orig/drivers/rtc/rtc-x1205.c      2006-03-29 02:14:50.000000000 
+0200
+++ linux-rtc/drivers/rtc/rtc-x1205.c   2006-03-29 02:33:57.000000000 +0200
@@ -19,7 +19,7 @@
 #include <linux/rtc.h>
 #include <linux/delay.h>
 
-#define DRV_VERSION "1.0.6"
+#define DRV_VERSION "1.0.7"
 
 /* Addresses to scan: none. This chip is located at
  * 0x6f and uses a two bytes register addressing.
@@ -473,24 +473,26 @@ static struct rtc_class_ops x1205_rtc_op
 static ssize_t x1205_sysfs_show_atrim(struct device *dev,
                                struct device_attribute *attr, char *buf)
 {
-       int atrim;
+       int err, atrim;
 
-       if (x1205_get_atrim(to_i2c_client(dev), &atrim) == 0)
-               return sprintf(buf, "%d.%02d pF\n",
-                       atrim / 1000, atrim % 1000);
-       return 0;
+       err = x1205_get_atrim(to_i2c_client(dev), &atrim);
+       if (err)
+               return err;
+
+       return sprintf(buf, "%d.%02d pF\n", atrim / 1000, atrim % 1000);
 }
 static DEVICE_ATTR(atrim, S_IRUGO, x1205_sysfs_show_atrim, NULL);
 
 static ssize_t x1205_sysfs_show_dtrim(struct device *dev,
                                struct device_attribute *attr, char *buf)
 {
-       int dtrim;
+       int err, dtrim;
 
-       if (x1205_get_dtrim(to_i2c_client(dev), &dtrim) == 0)
-               return sprintf(buf, "%d ppm\n", dtrim);
+       err = x1205_get_dtrim(to_i2c_client(dev), &dtrim);
+       if (err)
+               return err;
 
-       return 0;
+       return sprintf(buf, "%d ppm\n", dtrim);
 }
 static DEVICE_ATTR(dtrim, S_IRUGO, x1205_sysfs_show_dtrim, NULL);
 

--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at                                  www.tux.org/lkml/">http://www.tux.org/lkml/